From: Fabrice Popineau <fabrice.popineau@supelec.fr>
Date: Sun, 25 Mar 2012 18:30:50 +0000 (+0200)
Subject: Remove dead MSVC-specific code.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~368
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=95f37263444549bb68a5600f53bde21809d6a870;p=emacs.git

Remove dead MSVC-specific code.

 src/w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific code.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ad46ffe6cee..1ea8a4828c4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-25  Fabrice Popineau  <fabrice.popineau@supelec.fr>
+
+	* w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific
+	code.
+
 2012-03-25  Kenichi Handa  <handa@m17n.org>
 
 	* dispextern.h (struct glyph): Change the bit length of
diff --git a/src/w32heap.c b/src/w32heap.c
index 35ac4cbf31f..da8579896f2 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -296,27 +296,3 @@ round_heap (unsigned long align)
   if (need_to_alloc)
     sbrk (need_to_alloc);
 }
-
-#if (_MSC_VER >= 1000 && _MSC_VER < 1300 && !defined (USE_CRT_DLL))
-
-/* MSVC 4.2 invokes these functions from mainCRTStartup to initialize
-   a heap via HeapCreate.  They are normally defined by the runtime,
-   but we override them here so that the unnecessary HeapCreate call
-   is not performed.  */
-
-int __cdecl
-_heap_init (void)
-{
-  /* Stepping through the assembly indicates that mainCRTStartup is
-     expecting a nonzero success return value.  */
-  return 1;
-}
-
-void __cdecl
-_heap_term (void)
-{
-  return;
-}
-
-#endif
-